Merge branch 'master' of https://github.com/gpsbabel/gpsbabel
authorRobert Lipe <robertlipe@gpsbabel.org>
Fri, 30 Dec 2016 00:19:15 +0000 (18:19 -0600)
committerRobert Lipe <robertlipe@gpsbabel.org>
Fri, 30 Dec 2016 00:19:15 +0000 (18:19 -0600)

Trivial merge